From 13afd1b5e9048dd2244805a5c27fc802dbd7d036 Mon Sep 17 00:00:00 2001 From: Yauheni Akhotnikau Date: Tue, 4 Feb 2025 12:27:33 +0300 Subject: [PATCH] Adaptation for Asio from Boost-1.87. Gbp-Pq: Name 0001-Adaptation-for-Asio-from-Boost-1.87.patch --- dev/restinio/http_server_run.hpp | 4 +++- dev/restinio/impl/acceptor.hpp | 4 ++-- dev/restinio/impl/connection.hpp | 4 ++-- dev/test/basic_auth/main.cpp | 2 +- dev/test/bearer_auth/main.cpp | 2 +- dev/test/common/pub.hpp | 2 +- dev/test/file_upload/main.cpp | 2 +- dev/test/handle_requests/echo_body/main.cpp | 2 +- dev/test/multipart_body/main.cpp | 2 +- dev/test/response_coordinator/main.cpp | 2 +- dev/test/run_on_thread_pool/main.cpp | 16 +++++++++++----- dev/test/try_parse_field/main.cpp | 2 +- dev/test/write_group_output_ctx/main.cpp | 2 +- 13 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dev/restinio/http_server_run.hpp b/dev/restinio/http_server_run.hpp index b9d17fc..5f422ad 100644 --- a/dev/restinio/http_server_run.hpp +++ b/dev/restinio/http_server_run.hpp @@ -680,7 +680,9 @@ template inline void initiate_shutdown( http_server_t & server ) { - server.io_context().post( [&server] { + asio_ns::post( + server.io_context(), + [&server] { server.close_sync(); server.io_context().stop(); } ); diff --git a/dev/restinio/impl/acceptor.hpp b/dev/restinio/impl/acceptor.hpp index caa2fbf..cdf7fae 100644 --- a/dev/restinio/impl/acceptor.hpp +++ b/dev/restinio/impl/acceptor.hpp @@ -263,7 +263,7 @@ class acceptor_t final ep = m_acceptor.local_endpoint(); // Now we can switch acceptor to listen state. - m_acceptor.listen( asio_ns::socket_base::max_connections ); + m_acceptor.listen( asio_ns::socket_base::max_listen_connections ); // Call accept connections routine. for( std::size_t i = 0; i< this->concurrent_accept_sockets_count(); ++i ) @@ -616,7 +616,7 @@ class acceptor_t final else if( str_addr == "ip6-localhost" ) str_addr = "::1"; - result = asio_ns::ip::address::from_string( str_addr ); + result = asio_ns::ip::make_address( str_addr ); } else if( auto * addr_v = get_if( &from ) ) { diff --git a/dev/restinio/impl/connection.hpp b/dev/restinio/impl/connection.hpp index fa0c830..a6385cc 100644 --- a/dev/restinio/impl/connection.hpp +++ b/dev/restinio/impl/connection.hpp @@ -1053,8 +1053,8 @@ class connection_t final m_logger.trace( [&]{ // Get status line: const string_view_t status_line{ - asio_ns::buffer_cast< const char * >( - next_write_group->first.items().front().buf() ), + static_cast< const char * >( + next_write_group->first.items().front().buf().data() ), next_write_group->first.status_line_size() }; return fmt::format( diff --git a/dev/test/basic_auth/main.cpp b/dev/test/basic_auth/main.cpp index f20e727..2f9e03a 100644 --- a/dev/test/basic_auth/main.cpp +++ b/dev/test/basic_auth/main.cpp @@ -16,7 +16,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/dev/test/bearer_auth/main.cpp b/dev/test/bearer_auth/main.cpp index b5e94fd..264724b 100644 --- a/dev/test/bearer_auth/main.cpp +++ b/dev/test/bearer_auth/main.cpp @@ -15,7 +15,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/dev/test/common/pub.hpp b/dev/test/common/pub.hpp index 23d21bb..090af23 100644 --- a/dev/test/common/pub.hpp +++ b/dev/test/common/pub.hpp @@ -40,7 +40,7 @@ do_with_socket( socket.connect( restinio::asio_ns::ip::tcp::endpoint{ - restinio::asio_ns::ip::address::from_string( str_addr ), + restinio::asio_ns::ip::make_address( str_addr ), port } ); diff --git a/dev/test/file_upload/main.cpp b/dev/test/file_upload/main.cpp index 3528a08..bb355e7 100644 --- a/dev/test/file_upload/main.cpp +++ b/dev/test/file_upload/main.cpp @@ -15,7 +15,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/dev/test/handle_requests/echo_body/main.cpp b/dev/test/handle_requests/echo_body/main.cpp index f46a3cd..f4403bf 100644 --- a/dev/test/handle_requests/echo_body/main.cpp +++ b/dev/test/handle_requests/echo_body/main.cpp @@ -116,7 +116,7 @@ perform_test() [&request_handler]( auto & settings ){ settings .port( utest_default_port() ) - .address( restinio::asio_ns::ip::address::from_string( "127.0.0.1" ) ) + .address( restinio::asio_ns::ip::make_address( "127.0.0.1" ) ) .request_handler( request_handler ); } }; diff --git a/dev/test/multipart_body/main.cpp b/dev/test/multipart_body/main.cpp index a0975fa..40592f8 100644 --- a/dev/test/multipart_body/main.cpp +++ b/dev/test/multipart_body/main.cpp @@ -39,7 +39,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/dev/test/response_coordinator/main.cpp b/dev/test/response_coordinator/main.cpp index 1325092..8ff083f 100644 --- a/dev/test/response_coordinator/main.cpp +++ b/dev/test/response_coordinator/main.cpp @@ -33,7 +33,7 @@ make_string( const BUF & buf ) { return std::string{ - asio_ns::buffer_cast< const char * >( buf.buf() ), + static_cast< const char * >( buf.buf().data() ), asio_ns::buffer_size( buf.buf() ) }; } diff --git a/dev/test/run_on_thread_pool/main.cpp b/dev/test/run_on_thread_pool/main.cpp index d3e709c..10ab951 100644 --- a/dev/test/run_on_thread_pool/main.cpp +++ b/dev/test/run_on_thread_pool/main.cpp @@ -92,9 +92,11 @@ TEST_CASE( "on thread pool with break signals" , "[with_break_signal]" ) // Wait for HTTP server to run. std::promise started; - http_server.io_context().post( [&started] { - started.set_value(); - } ); + restinio::asio_ns::post( + http_server.io_context(), + [&started] { + started.set_value(); + } ); started.get_future().get(); std::string response; @@ -160,7 +162,9 @@ TEST_CASE( "on thread pool without break signals" , "[without_break_signal]" ) // Wait for HTTP server to run. std::promise started; - http_server.io_context().post( [&started] { + restinio::asio_ns::post( + http_server.io_context(), + [&started] { started.set_value(); } ); started.get_future().get(); @@ -228,7 +232,9 @@ TEST_CASE( "server on thread pool runner" , "[on_pool_runner]" ) // Wait for HTTP server to run. std::promise started; - http_server.io_context().post( [&started] { + restinio::asio_ns::post( + http_server.io_context(), + [&started] { started.set_value(); } ); started.get_future().get(); diff --git a/dev/test/try_parse_field/main.cpp b/dev/test/try_parse_field/main.cpp index b76e3c9..7134be5 100644 --- a/dev/test/try_parse_field/main.cpp +++ b/dev/test/try_parse_field/main.cpp @@ -16,7 +16,7 @@ auto make_dummy_endpoint() { return restinio::endpoint_t{ - restinio::asio_ns::ip::address::from_string("127.0.0.1"), + restinio::asio_ns::ip::make_address("127.0.0.1"), 12345u }; } diff --git a/dev/test/write_group_output_ctx/main.cpp b/dev/test/write_group_output_ctx/main.cpp index b4e1e78..2093e84 100644 --- a/dev/test/write_group_output_ctx/main.cpp +++ b/dev/test/write_group_output_ctx/main.cpp @@ -24,7 +24,7 @@ make_string( const asio_ns::const_buffer & buf ) { return std::string{ - asio_ns::buffer_cast< const char * >( buf ), + static_cast< const char * >( buf.data() ), asio_ns::buffer_size( buf ) }; } -- 2.30.2